0497a55c2603274f2920d24bb21ac70c0d77e8ef,core/kernel/source/jetbrains/mps/smodel/runtime/base/BasePropertyConstraintsDescriptor.java,BasePropertyConstraintsDescriptor,getSomethingUsingInheritance,#String#String#InheritanceCalculateParameters#,83

Before Change


      }

      if (parentPropertyDescriptor instanceof BasePropertyConstraintsDescriptor) {
        return parameters.getParentCalculatedDescriptor((BasePropertyConstraintsDescriptor) parentPropertyDescriptor);
      } else if (parentPropertyDescriptor instanceof PropertyConstraintsDispatchable) {
        if (parameters.hasOwn((PropertyConstraintsDispatchable) parentPropertyDescriptor)) {
          return parentPropertyDescriptor;

After Change


      PropertyConstraintsDescriptor parentCalculated;

      if (parentPropertyDescriptor instanceof BasePropertyConstraintsDescriptor) {
        parentCalculated = parameters.getParentCalculatedDescriptor((BasePropertyConstraintsDescriptor) parentPropertyDescriptor);
      } else if (parentPropertyDescriptor instanceof PropertyConstraintsDispatchable) {
        if (parameters.hasOwn((PropertyConstraintsDispatchable) parentPropertyDescriptor)) {
          parentCalculated = parentPropertyDescriptor;
        } else {
          parentCalculated = getSomethingUsingInheritance(parent, propertyName, parameters);
        }
      } else {
        parentCalculated = parentPropertyDescriptor;
      }

      if (parentCalculated != null) {
        return parentCalculated;
      }
    }